From 2d740fdc20e5368a8f07fc182483eacff732ac73 Mon Sep 17 00:00:00 2001
From: "robertlipe@gmail.com"
 <robertlipe@gmail.com@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Wed, 2 May 2012 14:27:54 +0000
Subject: [PATCH] Fixes for new version of Garmin Fit files.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4173 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/garmin_fit.c                         |   6 +
 .../track/garmin-edge-200-output.fit          | Bin 0 -> 1222 bytes
 .../track/garmin-edge-200-output.gpx          | 124 ++++++++++++++++++
 gpsbabel/testo.d/garmin_fit.test              |   3 +
 4 files changed, 133 insertions(+)
 create mode 100644 gpsbabel/reference/track/garmin-edge-200-output.fit
 create mode 100644 gpsbabel/reference/track/garmin-edge-200-output.gpx

diff --git a/gpsbabel/garmin_fit.c b/gpsbabel/garmin_fit.c
index 146972fd2..6e11975e0 100644
--- a/gpsbabel/garmin_fit.c
+++ b/gpsbabel/garmin_fit.c
@@ -96,6 +96,12 @@ fit_parse_header(void)
   if (sig[0] != '.' || sig[1] != 'F' || sig[2] != 'I' || sig[3] != 'T') {
     fatal(MYNAME ": .FIT signature missing\n");
   }
+
+  // Read in rest of header (if any)
+  len -= 12;
+  while( len-- ) {
+    gbfgetc(fin); // throw away unknown header data
+  }
 }
 
 static gbuint8
diff --git a/gpsbabel/reference/track/garmin-edge-200-output.fit b/gpsbabel/reference/track/garmin-edge-200-output.fit
new file mode 100644
index 0000000000000000000000000000000000000000..a0fc6ea5a2bd0bb28645fa019c7c668c9c5ec0c9
GIT binary patch
literal 1222
zcma)+O=ule6vzMPo_pWC+|=YH=DnAhd8tWy)5g-7TCgf^v|rIsM9{httW-s^5~&Ib
zHmS@E)<#KP1O>$|w9-}lD22Le!Hrh&0};`MLJM7qE;Lvr8PA<GTC*r#c#q-t&YbhR
z@1Ape8b@$i1L?%%KHyHss<EEcx*(M)l^K<RfDdmzfAO0ac{3p~WvO=n+n}H_B1K=L
z+zB*cmUO|okZ>YsQp&&J6Uy2Jw9%*nW&>T+b<wMfhAyOnu8LS+M@hOGsV-98r1~ge
zpTU<d*DS9gWlNC!fGW&aSrb)?INp>HTIa)d1FcGOr4W-c;#uuVg!cdgsEHwTPC7T0
zTTR@2z^gALZt=H}$0g&aU9{#0fsafl?z`oXPX)lRoes<efqx!K9O;P1yMYmVg3T`i
ze|#lzmzxpq9|AhIZ@^p@IRAFyrnW?UY&#Iz=Ahvty!q0Z#I4&EadD6QVfI|x^ay<P
zi^Q#eDB`ilf$Qz<Z4(MSej#y}o{RYC4A5tfwaf;A;bP*xd@bTzUI!ZXz0f2AUkXyU
z_e{hOegO2^lY{0~fp@f1_u2Om|Ng0uJl{4u1a8`xx|!vOw_Wt`aA@`ltZz?UeKh8M
zOF+N9Ei?}Zd~A2>miEN_bBhFi6q@}4pSVADH%-O-*H#jxvCvEjy!Sxrj?TthpY-sl
z&>R#v_hjncS%`Vl0YcN>*EWX)K0GajzKVI_Swd_l2h5DX&kv_=;@g<>=Lti0uHU>Y
z@YlK2z5hqdJLd@-?I-<aUf_l|Qa9Gq;e``~E%v8A^OnGYcT@NDXosIUP1tI0Y$y+X
zt3ZSO^Z)3s)mN_FT@!LPh^2p&pMqTb7RqZnU+MNPUBo)?=zK`$>veuZBUn~hx5}<l
zS&zz^Dr>21xEeKS#WrD(5E3F8hvOo7bqlWU=xmGOKYnMcOiT0mHmx@JpRW;|Y<?UD
zFft=uR0gV4KCvH=dKcX#CyVH6_kXOf`09LE=PSzM+gtgzRTio&QrXC=xXe>c&W==v
p5Udryw(!4#kPF01DwMce#_h^bR`(Hs{ndiHPwo@S1|m8*{x_?hL>~YE

literal 0
HcmV?d00001

diff --git a/gpsbabel/reference/track/garmin-edge-200-output.gpx b/gpsbabel/reference/track/garmin-edge-200-output.gpx
new file mode 100644
index 000000000..863760306
--- /dev/null
+++ b/gpsbabel/reference/track/garmin-edge-200-output.gpx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gpx
+  version="1.0"
+  creator="GPSBabel - http://www.gpsbabel.org"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://www.topografix.com/GPX/1/0"
+  xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
+<time>1970-01-01T00:00:00Z</time>
+<bounds minlat="50.874916077" minlon="4.361335754" maxlat="50.881267548" maxlon="4.373297691"/>
+<trk>
+<trkseg>
+<trkpt lat="50.874992371" lon="4.361335754">
+  <ele>18.800000</ele>
+  <time>2012-05-02T06:31:48Z</time>
+  <speed>2.806000</speed>
+</trkpt>
+<trkpt lat="50.874927521" lon="4.361547470">
+  <ele>18.400000</ele>
+  <time>2012-05-02T06:31:55Z</time>
+  <speed>1.919000</speed>
+</trkpt>
+<trkpt lat="50.874916077" lon="4.361658096">
+  <ele>18.600000</ele>
+  <time>2012-05-02T06:32:03Z</time>
+  <speed>0.934000</speed>
+</trkpt>
+<trkpt lat="50.875255585" lon="4.362043858">
+  <ele>17.600000</ele>
+  <time>2012-05-02T06:32:15Z</time>
+  <speed>5.137000</speed>
+</trkpt>
+<trkpt lat="50.875720978" lon="4.362524986">
+  <ele>17.000000</ele>
+  <time>2012-05-02T06:32:25Z</time>
+  <speed>6.165000</speed>
+</trkpt>
+<trkpt lat="50.876182556" lon="4.363010883">
+  <ele>16.600000</ele>
+  <time>2012-05-02T06:32:35Z</time>
+  <speed>6.081000</speed>
+</trkpt>
+<trkpt lat="50.876644135" lon="4.363592148">
+  <ele>15.800000</ele>
+  <time>2012-05-02T06:32:46Z</time>
+  <speed>5.946000</speed>
+</trkpt>
+<trkpt lat="50.877075195" lon="4.364209652">
+  <ele>15.400000</ele>
+  <time>2012-05-02T06:32:57Z</time>
+  <speed>5.777000</speed>
+</trkpt>
+<trkpt lat="50.877471924" lon="4.364851475">
+  <ele>15.200000</ele>
+  <time>2012-05-02T06:33:07Z</time>
+  <speed>6.576000</speed>
+</trkpt>
+<trkpt lat="50.877845764" lon="4.365548134">
+  <ele>15.000000</ele>
+  <time>2012-05-02T06:33:17Z</time>
+  <speed>6.313000</speed>
+</trkpt>
+<trkpt lat="50.878185272" lon="4.366267204">
+  <ele>15.200000</ele>
+  <time>2012-05-02T06:33:27Z</time>
+  <speed>6.091000</speed>
+</trkpt>
+<trkpt lat="50.878505707" lon="4.367033005">
+  <ele>15.200000</ele>
+  <time>2012-05-02T06:33:37Z</time>
+  <speed>6.529000</speed>
+</trkpt>
+<trkpt lat="50.878822327" lon="4.367795467">
+  <ele>15.600000</ele>
+  <time>2012-05-02T06:33:47Z</time>
+  <speed>6.456000</speed>
+</trkpt>
+<trkpt lat="50.879154205" lon="4.368566990">
+  <ele>15.600000</ele>
+  <time>2012-05-02T06:33:57Z</time>
+  <speed>6.586000</speed>
+</trkpt>
+<trkpt lat="50.879478455" lon="4.369322300">
+  <ele>15.400000</ele>
+  <time>2012-05-02T06:34:07Z</time>
+  <speed>6.437000</speed>
+</trkpt>
+<trkpt lat="50.879795074" lon="4.370081425">
+  <ele>15.400000</ele>
+  <time>2012-05-02T06:34:17Z</time>
+  <speed>6.516000</speed>
+</trkpt>
+<trkpt lat="50.880119324" lon="4.370834351">
+  <ele>16.200000</ele>
+  <time>2012-05-02T06:34:27Z</time>
+  <speed>5.970000</speed>
+</trkpt>
+<trkpt lat="50.880420685" lon="4.371550560">
+  <ele>17.400000</ele>
+  <time>2012-05-02T06:34:38Z</time>
+  <speed>5.193000</speed>
+</trkpt>
+<trkpt lat="50.880470276" lon="4.371663570">
+  <ele>17.800000</ele>
+  <time>2012-05-02T06:34:40Z</time>
+  <speed>4.752000</speed>
+</trkpt>
+<trkpt lat="50.880798340" lon="4.372401714">
+  <ele>19.600000</ele>
+  <time>2012-05-02T06:34:53Z</time>
+  <speed>4.809000</speed>
+</trkpt>
+<trkpt lat="50.881038666" lon="4.372861862">
+  <ele>20.800000</ele>
+  <time>2012-05-02T06:35:02Z</time>
+  <speed>4.576000</speed>
+</trkpt>
+<trkpt lat="50.881267548" lon="4.373297691">
+  <ele>21.400000</ele>
+  <time>2012-05-02T06:35:11Z</time>
+  <speed>4.137000</speed>
+</trkpt>
+</trkseg>
+</trk>
+</gpx>
diff --git a/gpsbabel/testo.d/garmin_fit.test b/gpsbabel/testo.d/garmin_fit.test
index 65a4c40ad..569855385 100644
--- a/gpsbabel/testo.d/garmin_fit.test
+++ b/gpsbabel/testo.d/garmin_fit.test
@@ -4,3 +4,6 @@
 rm -f ${TMPDIR}/fit-*
 gpsbabel -i garmin_fit -f ${REFERENCE}/track/fit-sample.fit -o gpx -F ${TMPDIR}/fit-sameple.gpx
 compare ${TMPDIR}/fit-sameple.gpx ${REFERENCE}/track/fit-sample.gpx
+
+gpsbabel -i garmin_fit -f ${REFERENCE}/track/garmin-edge-200-output.fit -o gpx -F ${TMPDIR}/fit-sample.gpx
+compare ${TMPDIR}/fit-sample.gpx ${REFERENCE}/track/garmin-edge-200-output.gpx
-- 
2.30.2